git-annex.git
13 months agotry truncateFilePath on windows again
Joey Hess [Thu, 30 Jan 2025 21:06:22 +0000 (17:06 -0400)]
try truncateFilePath on windows again

after fix in commit 773115fd5f9334855b138323b74ca572695208a0
maybe it will work now and not break test suite?

13 months agofix truncateFilePath edge case on windows
Joey Hess [Thu, 30 Jan 2025 20:51:42 +0000 (16:51 -0400)]
fix truncateFilePath edge case on windows

If the filepath starts with something that is not valid utf-8, it would
have returned "". And if the filepath was all non-valid utf-8, it would
also return "".

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 30 Jan 2025 20:33:36 +0000 (16:33 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agotry fixing windows test suite
Joey Hess [Thu, 30 Jan 2025 20:31:49 +0000 (16:31 -0400)]
try fixing windows test suite

Test suite is failing in windows in conflict resolution tests, where the
automatic conflict resolution adds in a .variant file. On windows, those
files are somehow missing. I don't understand why, and the test failures
only happen on appveyor and not in a local windows VM.

So, since replaceFile was recently changed to remove a windows specific
ifdef, put it back, to see if that is somehow causing these failures.

13 months agoAdded a comment
jnkl [Thu, 30 Jan 2025 19:59:09 +0000 (19:59 +0000)]
Added a comment

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 30 Jan 2025 19:52:31 +0000 (15:52 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agoAdded a comment
luciusf [Thu, 30 Jan 2025 19:17:58 +0000 (19:17 +0000)]
Added a comment

13 months agoupdate
Joey Hess [Thu, 30 Jan 2025 19:06:37 +0000 (15:06 -0400)]
update

13 months agoMerge branch 'ospath-mk1'
Joey Hess [Thu, 30 Jan 2025 19:05:18 +0000 (15:05 -0400)]
Merge branch 'ospath-mk1'

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 30 Jan 2025 19:03:47 +0000 (15:03 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agoupdate appveyor cache directory
Joey Hess [Thu, 30 Jan 2025 19:02:59 +0000 (15:02 -0400)]
update appveyor cache directory

With old:

Cache entry not found: C:\projects\git-annex\Users\appveyor\.stack

I think fixing this will result in caching preventing a full rebuild of
git-annex each time.

13 months agoresponse
Joey Hess [Thu, 30 Jan 2025 18:57:51 +0000 (14:57 -0400)]
response

13 months agoavoid build warning
Joey Hess [Thu, 30 Jan 2025 18:52:41 +0000 (14:52 -0400)]
avoid build warning

An odd one, it complained about security_attributes being defined but
not used, but it was used..

13 months agoAdded a comment
jnkl [Thu, 30 Jan 2025 18:52:14 +0000 (18:52 +0000)]
Added a comment

13 months agoavoid build warnings on windows
Joey Hess [Thu, 30 Jan 2025 18:49:38 +0000 (14:49 -0400)]
avoid build warnings on windows

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 30 Jan 2025 18:39:05 +0000 (14:39 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months ago(no commit message)
jnkl [Thu, 30 Jan 2025 18:35:55 +0000 (18:35 +0000)]

13 months agobring back OsPath changes
Joey Hess [Thu, 30 Jan 2025 18:34:21 +0000 (14:34 -0400)]
bring back OsPath changes

I hope that the windows test suite failure on appveyor was fixed by
updating to a newer windows there. I have not been able to reproduce
that failure in a windows 11 VM run locally.

13 months agoRevert "disable OsPath build flag on windows for now"
Joey Hess [Thu, 30 Jan 2025 18:32:44 +0000 (14:32 -0400)]
Revert "disable OsPath build flag on windows for now"

This reverts commit 55cf9ce28fe1c8a4ee64f1843cd3a88e85bcbf35.

Problem was fixed by commit c1e90767daeff7557e047ea4229d83c4e78f9f12

13 months agofix FileIO openTempFile on Windows
Joey Hess [Thu, 30 Jan 2025 18:23:00 +0000 (14:23 -0400)]
fix FileIO openTempFile on Windows

When an UNC-style path is passed into openTempFile, the returned file
starts with that same style of path. Which can cause problems, eg piping
that filename to git failed. So, convert the output filename to be
relative to the input temp directory.

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 30 Jan 2025 17:25:49 +0000 (13:25 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agoswitch appveyor windows build to newer version
Joey Hess [Thu, 30 Jan 2025 17:24:51 +0000 (13:24 -0400)]
switch appveyor windows build to newer version

13 months ago(no commit message)
matrss [Thu, 30 Jan 2025 14:50:58 +0000 (14:50 +0000)]

13 months agoAdded a comment
dmcardle [Thu, 30 Jan 2025 13:56:30 +0000 (13:56 +0000)]
Added a comment

13 months ago(no commit message)
nobodyinperson [Thu, 30 Jan 2025 12:59:00 +0000 (12:59 +0000)]

13 months ago(no commit message)
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec [Thu, 30 Jan 2025 02:35:09 +0000 (02:35 +0000)]

13 months agoclose
Joey Hess [Wed, 29 Jan 2025 23:05:37 +0000 (19:05 -0400)]
close

13 months agodocument a SNAFU
Joey Hess [Wed, 29 Jan 2025 23:04:13 +0000 (19:04 -0400)]
document a SNAFU

13 months agothrowing away a week's work
Joey Hess [Wed, 29 Jan 2025 22:59:09 +0000 (18:59 -0400)]
throwing away a week's work

This was an attempt at continuing the RawFilePath transition into an
OsPath transition. Unforunately, it had multiple test suite failures on
windows. Debugging those seems that it would be more work than the
minor optimisation value of this.

13 months agomerge in doc changes from master
Joey Hess [Wed, 29 Jan 2025 22:57:25 +0000 (18:57 -0400)]
merge in doc changes from master

13 months agofix liuxstandalone build
Joey Hess [Wed, 29 Jan 2025 22:12:00 +0000 (18:12 -0400)]
fix liuxstandalone build

13 months agodisable OsPath build flag on windows for now
Joey Hess [Wed, 29 Jan 2025 21:22:21 +0000 (17:22 -0400)]
disable OsPath build flag on windows for now

Test suite failure looks like this:

        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        git-annex: fd:4: Data.ByteString.hGetLine: end of file
        git-annex: user error (git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","hash-object","-w","--no-filters","--stdin-paths"] exited 128)

This is apparently in Git.HashObject, and probably in hashBlob, which uses a
temp file with a name starting with "hash", but I have not been able to tell
what's wrong.

I don't understand where the "\\?" path prefix (windows UNC-style path)
is coming from in the path that gets fed into git hash-file, or why git
hash-file can't open the file.

13 months agoremove temp debugging code
Joey Hess [Wed, 29 Jan 2025 21:19:01 +0000 (17:19 -0400)]
remove temp debugging code

13 months agodebug test suite crash on windows
Joey Hess [Wed, 29 Jan 2025 20:37:54 +0000 (16:37 -0400)]
debug test suite crash on windows

13 months agofix windows build
Joey Hess [Wed, 29 Jan 2025 19:36:41 +0000 (15:36 -0400)]
fix windows build

13 months agofix fromOsPath on windows
Joey Hess [Wed, 29 Jan 2025 18:19:25 +0000 (14:19 -0400)]
fix fromOsPath on windows

Same reasons as 9c9baf7c6581235643661b94f70f76f8a10ae60e

13 months agofix toOsPath on windows
Joey Hess [Wed, 29 Jan 2025 18:06:54 +0000 (14:06 -0400)]
fix toOsPath on windows

After recent changes to use OsPath, test suite fails on windows with:

Exception: Uneven number of bytes: 5. This is not a Word16 bytestream.

Hopefully this fixes it. The innefficiency of the conversion is
unfortunate.

13 months agoresponse
Joey Hess [Wed, 29 Jan 2025 16:06:22 +0000 (12:06 -0400)]
response

13 months agoAdded a comment
dmcardle [Wed, 29 Jan 2025 14:44:38 +0000 (14:44 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Wed, 29 Jan 2025 10:13:59 +0000 (10:13 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Wed, 29 Jan 2025 09:56:13 +0000 (09:56 +0000)]
Added a comment

13 months agoAdded a comment
Atemu [Tue, 28 Jan 2025 21:57:42 +0000 (21:57 +0000)]
Added a comment

13 months ago(no commit message)
jnkl [Tue, 28 Jan 2025 21:32:18 +0000 (21:32 +0000)]

13 months agoAdded a comment
jnkl [Tue, 28 Jan 2025 21:20:17 +0000 (21:20 +0000)]
Added a comment

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 28 Jan 2025 20:00:09 +0000 (16:00 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agowindows build fix
Joey Hess [Tue, 28 Jan 2025 19:59:45 +0000 (15:59 -0400)]
windows build fix

and a little more bonus RawFilePath conversion

13 months agocorrect typo
cwg [Tue, 28 Jan 2025 19:29:21 +0000 (19:29 +0000)]
correct typo

13 months ago(no commit message)
cwg [Tue, 28 Jan 2025 19:18:02 +0000 (19:18 +0000)]

13 months ago(no commit message)
andrew [Tue, 28 Jan 2025 18:07:59 +0000 (18:07 +0000)]

13 months agopoll vote (My phone (or MP3 player))
65.254.22.34 [Tue, 28 Jan 2025 17:09:37 +0000 (17:09 +0000)]
poll vote (My phone (or MP3 player))

13 months agopoll vote (My phone (or MP3 player))
65.254.22.34 [Tue, 28 Jan 2025 17:09:30 +0000 (17:09 +0000)]
poll vote (My phone (or MP3 player))

13 months agocomment
Joey Hess [Tue, 28 Jan 2025 15:57:03 +0000 (11:57 -0400)]
comment

13 months agoupdate
Joey Hess [Tue, 28 Jan 2025 15:38:04 +0000 (11:38 -0400)]
update

13 months agoupdate
Joey Hess [Tue, 28 Jan 2025 15:36:02 +0000 (11:36 -0400)]
update

13 months agocomment
Joey Hess [Tue, 28 Jan 2025 15:12:02 +0000 (11:12 -0400)]
comment

13 months agocomment
Joey Hess [Tue, 28 Jan 2025 14:28:35 +0000 (10:28 -0400)]
comment

13 months agoAdded a comment: Simple config amendment for Apache served repositories
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec [Tue, 28 Jan 2025 08:34:40 +0000 (08:34 +0000)]
Added a comment: Simple config amendment for Apache served repositories

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 27 Jan 2025 16:23:13 +0000 (12:23 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agocomment
Joey Hess [Mon, 27 Jan 2025 16:19:16 +0000 (12:19 -0400)]
comment

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 15:26:15 +0000 (15:26 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 15:14:44 +0000 (15:14 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 15:08:57 +0000 (15:08 +0000)]
Added a comment

13 months agothoughts
Joey Hess [Mon, 27 Jan 2025 14:37:35 +0000 (10:37 -0400)]
thoughts

13 months agoupdate comment
Joey Hess [Mon, 27 Jan 2025 14:25:55 +0000 (10:25 -0400)]
update comment

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 27 Jan 2025 13:35:44 +0000 (09:35 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agofix link
Joey Hess [Mon, 27 Jan 2025 13:35:33 +0000 (09:35 -0400)]
fix link

13 months agoreporting on FTBFS
yarikoptic [Mon, 27 Jan 2025 12:32:32 +0000 (12:32 +0000)]
reporting on FTBFS

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 11:28:43 +0000 (11:28 +0000)]
Added a comment

13 months agoAdded a comment
Atemu [Sun, 26 Jan 2025 13:30:10 +0000 (13:30 +0000)]
Added a comment

13 months agoAdded a comment
jnkl [Sun, 26 Jan 2025 13:09:05 +0000 (13:09 +0000)]
Added a comment

13 months agoSome clarifications in my reproduce steps about the state of the rsync remote
luciusf [Sun, 26 Jan 2025 11:29:02 +0000 (11:29 +0000)]
Some clarifications in my reproduce steps about the state of the rsync remote

13 months agorename bugs/rsyncurl_without___34____58____34___creates_local_folder_as_repo.mdwn...
luciusf [Sun, 26 Jan 2025 11:19:53 +0000 (11:19 +0000)]
rename bugs/rsyncurl_without___34____58____34___creates_local_folder_as_repo.mdwn to bugs/rsyncurl_without___34____58____34___creates_local_folder_as_remote.mdwn

13 months agoInitial post
luciusf [Sun, 26 Jan 2025 11:18:11 +0000 (11:18 +0000)]
Initial post

13 months ago(no commit message)
goglu6 [Sun, 26 Jan 2025 03:02:03 +0000 (03:02 +0000)]

13 months agoAdded a comment
Atemu [Sun, 26 Jan 2025 02:54:18 +0000 (02:54 +0000)]
Added a comment

13 months agoAdded a comment
Atemu [Sun, 26 Jan 2025 02:36:51 +0000 (02:36 +0000)]
Added a comment

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Sat, 25 Jan 2025 14:57:07 +0000 (10:57 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agowindows build fix
Joey Hess [Sat, 25 Jan 2025 14:56:54 +0000 (10:56 -0400)]
windows build fix

13 months ago(no commit message)
jnkl [Sat, 25 Jan 2025 12:00:20 +0000 (12:00 +0000)]

13 months agoAdded a comment
jnkl [Sat, 25 Jan 2025 11:49:29 +0000 (11:49 +0000)]
Added a comment

13 months agoanother windows build fix
Joey Hess [Fri, 24 Jan 2025 20:33:26 +0000 (16:33 -0400)]
another windows build fix

13 months agomore windows and osx build fixes
Joey Hess [Fri, 24 Jan 2025 19:13:20 +0000 (15:13 -0400)]
more windows and osx build fixes

13 months agomore windows and osx build fixes
Joey Hess [Fri, 24 Jan 2025 17:46:13 +0000 (13:46 -0400)]
more windows and osx build fixes

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 24 Jan 2025 15:39:43 +0000 (11:39 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agowindows and osx build fixes for recent ByteString conversion work
Joey Hess [Fri, 24 Jan 2025 15:37:17 +0000 (11:37 -0400)]
windows and osx build fixes for recent ByteString conversion work

13 months agoavoid build warning on windows
Joey Hess [Fri, 24 Jan 2025 15:33:50 +0000 (11:33 -0400)]
avoid build warning on windows

13 months agoremove a few unused imports on windows
Joey Hess [Fri, 24 Jan 2025 15:32:26 +0000 (11:32 -0400)]
remove a few unused imports on windows

13 months agoAdded a comment
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec [Fri, 24 Jan 2025 08:04:27 +0000 (08:04 +0000)]
Added a comment

13 months agoAdded a comment
yarikoptic [Thu, 23 Jan 2025 21:33:26 +0000 (21:33 +0000)]
Added a comment

13 months agocomplaining about dead
yarikoptic [Thu, 23 Jan 2025 16:12:18 +0000 (16:12 +0000)]
complaining about dead

13 months agoAdded a comment
yarikoptic [Thu, 23 Jan 2025 15:53:39 +0000 (15:53 +0000)]
Added a comment

13 months agoupdate
Joey Hess [Thu, 23 Jan 2025 14:27:18 +0000 (10:27 -0400)]
update

13 months agoresponse
Joey Hess [Wed, 22 Jan 2025 20:48:51 +0000 (16:48 -0400)]
response

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 22 Jan 2025 20:42:50 +0000 (16:42 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agoparsePOSIXTime ByteString conversion
Joey Hess [Wed, 22 Jan 2025 20:41:06 +0000 (16:41 -0400)]
parsePOSIXTime ByteString conversion

Some easy (though tiny) speed wins.

Sponsored-by: Luke T. Shumaker on Patreon
13 months agofix reversion
Joey Hess [Wed, 22 Jan 2025 20:28:29 +0000 (16:28 -0400)]
fix reversion

af3b9cbd3647ecfb3f3f6c4008dc9e64f7d42591 lost takeFileName, breaking the
test suite

13 months agoconvert from readFileStrict
Joey Hess [Wed, 22 Jan 2025 20:19:06 +0000 (16:19 -0400)]
convert from readFileStrict

This removes that function, using file-io readFile' instead.

Had to deal with newline conversion, which readFileStrict does on
Windows. In a few cases, that was pretty ugly to deal with.

Sponsored-by: Kevin Mueller
13 months agofix reversion
Joey Hess [Wed, 22 Jan 2025 19:32:21 +0000 (15:32 -0400)]
fix reversion

In 793ddecd4b72a5e4746b3b426d3bca400737118b, writeSshConfig was made to
writeFile a ByteString, which lost the newline conversion on Windows.

Added linesFile to fix it. This will also be useful for other writeFile
conversions.

13 months agoconvert from readFileStrict
Joey Hess [Wed, 22 Jan 2025 19:19:47 +0000 (15:19 -0400)]
convert from readFileStrict

In cases where it reads lines, which needs newline conversion on
windows.

13 months agoconvert from readFileStrict
Joey Hess [Wed, 22 Jan 2025 18:43:37 +0000 (14:43 -0400)]
convert from readFileStrict

More of these still to convert, but need to be careful of newline
translation.